feat(grit): implement disregarded snippet nodes #4084
Merged
+272
−20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
As I was looking into #4077, I discovered the reason it didn't match was very silly: The query was lacking the trailing semicolon which is part of the syntax rule for type declarations. A fix wasn't entirely trivial however, but I discovered a TODO which could help out: Grit's own language bindings implement the notion of "disregarded snippet fields", which is a way of filtering out fields from the snippet pattern that are not relevant for a match.
Grit themselves don't use this functionality for filtering out semicolons (I guess they're treated differently in the TreeSitter grammar), but we can! So I implemented this, but there was one more hurdle: recognizing the semicolons depends on matching them by their slot index, which I would rather not hard-code. So I extended the codegen to generate the necessary constants as well.
Also thanks to the disregarded snippet fields, Grit queries for functions can now also match
asyncfunctions by default.Fixes #4077
Test Plan
Tests added.